Don't try to remove stuff from an empty model. (#156575, Christian Persch)

2004-10-31  Matthias Clasen  <mclasen@redhat.com>

	* tests/testentrycompletion.c (animation_timer): Don't try to
	remove stuff from an empty model.  (#156575, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index 258677c7707766c3444fc2728347fd0c9b14d65c..765a7bb846f5823cab9b9bbb007eb322cea58288 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testentrycompletion.c (animation_timer): Don't try to
+       remove stuff from an empty model.  (#156575, Christian Persch)
+
        * gtk/gtkentrycompletion.c (gtk_entry_completion_class_init): 
        * gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_class_init): 
        Update doc comments.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 258677c7707766c3444fc2728347fd0c9b14d65c..765a7bb846f5823cab9b9bbb007eb322cea58288 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testentrycompletion.c (animation_timer): Don't try to
+       remove stuff from an empty model.  (#156575, Christian Persch)
+
        * gtk/gtkentrycompletion.c (gtk_entry_completion_class_init): 
        * gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_class_init): 
        Update doc comments.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 258677c7707766c3444fc2728347fd0c9b14d65c..765a7bb846f5823cab9b9bbb007eb322cea58288 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testentrycompletion.c (animation_timer): Don't try to
+       remove stuff from an empty model.  (#156575, Christian Persch)
+
        * gtk/gtkentrycompletion.c (gtk_entry_completion_class_init): 
        * gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_class_init): 
        Update doc comments.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 258677c7707766c3444fc2728347fd0c9b14d65c..765a7bb846f5823cab9b9bbb007eb322cea58288 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testentrycompletion.c (animation_timer): Don't try to
+       remove stuff from an empty model.  (#156575, Christian Persch)
+
        * gtk/gtkentrycompletion.c (gtk_entry_completion_class_init): 
        * gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_class_init): 
        Update doc comments.

diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 0f7a74f761907761fa1c46324807803b631fe337..2ffd1e9e3fcd5bb5073154ac1dc95f57d1be0889 100644 (file)
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -217,7 +217,7 @@ animation_timer (GtkEntryCompletion *completion)
        {
          g_print ("readding model!\n");
          
-         gtk_entry_completion_set_model (completion, GTK_TREE_MODEL(old_store));
+         gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (old_store));
          g_object_unref (old_store);
          old_store = NULL;
        }
@@ -237,8 +237,8 @@ animation_timer (GtkEntryCompletion *completion)
        }
       else
        {
-         gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
-         gtk_list_store_remove (store, &iter);
+         if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter))
+           gtk_list_store_remove (store, &iter);
        }
     }